Fix to let TCP server run without SSL installed.

signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>

diff --git a/tools/python/xen/xend/server/XMLRPCServer.py b/tools/python/xen/xend/server/XMLRPCServer.py
index 661581fd3abe99756658fc1974f95070c467433c..81a799b1851183117f8cca1ea84ab8f08909d802 100644 (file)
--- a/tools/python/xen/xend/server/XMLRPCServer.py
+++ b/tools/python/xen/xend/server/XMLRPCServer.py
@@ -126,11 +126,10 @@ class XMLRPCServer:
                          'all interfaces, port ',
                          self.port, authmsg)
 
-                if not ssl_enabled:
-                    raise ValueError("pyOpenSSL not installed. "
-                                     "Unable to start HTTPS XML-RPC server")
-
                 if using_ssl:
+                    if not ssl_enabled:
+                        raise ValueError("pyOpenSSL not installed. "
+                                         "Unable to start HTTPS XML-RPC server")
                     self.server = SSLXMLRPCServer(
                         (self.host, self.port),
                         self.hosts_allowed,